Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 20 Jan 2010 21:55:26 +0000 (21:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 20 Jan 2010 21:55:26 +0000 (21:55 +0000)
commit9cb467e6c28fcf7380d127b1b42cd536f2a03fbb
tree8c2f7a3260b1404c2f52981e89e7c704da3271c7
parentb3cfcfefad2f44f9124a29b958bbe20f84df4385
parentbdd1870b47e351dadc32b6e9d7dd64a49f653944
Merge from mainline.